Resolve CVS conflicts

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 76b4efccdd277870acfc1a461c277b1ce84c0295..1f15184f5527dae70ed5061316dd4df3a132d3ad 100644 (file)
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -243,4 +243,5 @@ to the action header."
 
 (provide 'cfengine)
 
+;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
 ;;; cfengine.el ends here